Small string tweaks

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 9c7655c236d4d056211b0a1e6a66996907746f38..6035cae2ff031a1196798366ab1b174a0538b6a6 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -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 f2bd1d16f73272bceea8ff25a22a8132b9c40a16..648744bcd57709088ad1f9565d83f9ab8e28dfca 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -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 0601eb7c0da05f60c4b61d31e1745c84cd475ae5..ac0b45afb59ef6b497143be887fc57995dadc29b 100644 (file)
--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -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 620078a410e221098d3fd4a1893afe635984a1d7..30ce6a999270c1fb7aaad1f6ab80fbc3f3195e05 100644 (file)
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -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);