Small string tweaks

petere · petere · commit 588901df8458 · 2007-09-25T16:29:34.000Z
diff --git 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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`* Portions Copyright (c) 1994, Regents of the University of California`
`43`	`43`	`* Portions taken from FreeBSD.`
`44`	`44`	`*`
`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 $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -2546,8 +2546,8 @@ usage(const char *progname)`
`2546`	`2546`	`" in the respective category (default taken from\n"`
`2547`	`2547`	`" environment)\n"));`
`2548`	`2548`	`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"));`
`2551`	`2551`	`printf(_(" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"));`
`2552`	`2552`	`printf(_(" -A, --auth=METHOD default authentication method for local connections\n"));`
`2553`	`2553`	`printf(_(" -U, --username=NAME database superuser name\n"));`
`@@ -3036,7 +3036,7 @@ main(int argc, char *argv[])`
`3036`	`3036`	`}`
`3037`	`3037`	`else if (strcmp(checkmatch, default_text_search_config) != 0)`
`3038`	`3038`	`{`
`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"),`
`3040`	`3040`	`progname, default_text_search_config, lc_ctype);`
`3041`	`3041`	`}`
`3042`	`3042`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`6`	`6`	`*`
`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 $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -535,7 +535,7 @@ unlimit_core_size(void)`
`535`	`535`	`getrlimit(RLIMIT_CORE,&lim);`
`536`	`536`	`if (lim.rlim_max == 0)`
`537`	`537`	`{`
`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"),`
`539`	`539`	`progname);`
`540`	`540`	`return;`
`541`	`541`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`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 $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -349,7 +349,7 @@ handle_sigint(SIGNAL_ARGS)`
`349`	`349`	`if (PQcancel(cancelConn, errbuf, sizeof(errbuf)))`
`350`	`350`	`fprintf(stderr, _("Cancel request sent\n"));`
`351`	`351`	`else`
`352`		`- fprintf(stderr, _("Could not send cancel request: %s\n"), errbuf);`
	`352`	`+ fprintf(stderr, _("Could not send cancel request: %s"), errbuf);`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`errno = save_errno; /* just in case the write changed it */`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* 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 $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -464,7 +464,7 @@ pg_GSS_startup(PGconn *conn)`
`464`	`464`	`if (conn->gctx)`
`465`	`465`	`{`
`466`	`466`	`printfPQExpBuffer(&conn->errorMessage,`
`467`		`- libpq_gettext("duplicate GSS auth request\n"));`
	`467`	`+ libpq_gettext("duplicate GSS authentication request\n"));`
`468`	`468`	`return STATUS_ERROR;`
`469`	`469`	`}`
`470`	`470`
`@@ -666,7 +666,7 @@ pg_SSPI_startup(PGconn *conn, int use_negotiate)`
`666`	`666`	`*/`
`667`	`667`	`if (conn->pghost == NULL)`
`668`	`668`	`{`
`669`		`- printfPQExpBuffer(&conn->errorMessage, libpq_gettext("hostname must be specified\n"));`
	`669`	`+ printfPQExpBuffer(&conn->errorMessage, libpq_gettext("host name must be specified\n"));`
`670`	`670`	`return STATUS_ERROR;`
`671`	`671`	`}`
`672`	`672`	`conn->sspitarget = malloc(strlen(conn->krbsrvname)+strlen(conn->pghost)+2);`