Small message fixes

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index de5cc47077d0673d4bbbdf345c123d8fa6d69ba4..c8ff2cbc7bc493d64b8907538f58ab6629201a79 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -2548,7 +2548,7 @@ check_locale_name(int category, const char *locale, char **canonname)
    save = setlocale(category, NULL);
    if (!save)
    {
-       fprintf(stderr, _("%s: setlocale failed\n"),
+       fprintf(stderr, _("%s: setlocale() failed\n"),
                progname);
        exit(1);
    }

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 0b02c4c4014b59a6e09fcd6c121caea7934a64de..3d26e22b8fc982278d3b7597ad9c5b8130f05527 100644 (file)
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -1123,13 +1123,13 @@ update_tablespace_symlink(Oid oid, const char *old_dir)
 
        if (unlink(linkloc) != 0 && errno != ENOENT)
        {
-           fprintf(stderr, _("%s: could not remove symbolic link \"%s\": %s"),
+           fprintf(stderr, _("%s: could not remove symbolic link \"%s\": %s\n"),
                    progname, linkloc, strerror(errno));
            disconnect_and_exit(1);
        }
        if (symlink(new_dir, linkloc) != 0)
        {
-           fprintf(stderr, _("%s: could not create symbolic link \"%s\": %s"),
+           fprintf(stderr, _("%s: could not create symbolic link \"%s\": %s\n"),
                    progname, linkloc, strerror(errno));
            disconnect_and_exit(1);
        }

diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index aa06503fb04cfaba5e37b458d4782e9912e77136..457b742fa487d1b5cb2068a0e8a9d3c70a82e1b0 100644 (file)
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -1083,7 +1083,7 @@ _tarAddFile(ArchiveHandle *AH, TAR_MEMBER *th)
    fseeko(tmp, 0, SEEK_END);
    th->fileLen = ftello(tmp);
    if (th->fileLen < 0)
-       exit_horribly(modulename, "could not determine seek position in file: %s\n",
+       exit_horribly(modulename, "could not determine seek position in archive file: %s\n",
                      strerror(errno));
    fseeko(tmp, 0, SEEK_SET);
 

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 412f52f7071671b8ddc4f918b9691e31b2197c38..5c0f95fea35e7e32bbeab8104b242b5596089e11 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -582,7 +582,7 @@ main(int argc, char **argv)
    }
 
    if (if_exists && !outputClean)
-       exit_horribly(NULL, "option --if-exists requires -c/--clean option\n");
+       exit_horribly(NULL, "option --if-exists requires option -c/--clean\n");
 
    /* Identify archive format to emit */
    archiveFormat = parseArchiveFormat(format, &archiveMode);

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index a15d14b6acda2d7077412646fdece146fffdfb6b..405009158d5a3d2e60c1bf737e6c3e261630a7c4 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -338,7 +338,7 @@ main(int argc, char *argv[])
 
    if (if_exists && !output_clean)
    {
-       fprintf(stderr, _("%s: option --if-exists requires -c/--clean option\n"),
+       fprintf(stderr, _("%s: option --if-exists requires option -c/--clean\n"),
                progname);
        exit_nicely(1);
    }

diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index f7f3f51ed3550613d893d2e55e220fa4e9281009..dcb51090dbd26eae9f0e95297ab10a720b40eb57 100644 (file)
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -340,7 +340,7 @@ main(int argc, char **argv)
 
    if (if_exists && !opts->dropSchema)
    {
-       fprintf(stderr, _("%s: option --if-exists requires -c/--clean option\n"),
+       fprintf(stderr, _("%s: option --if-exists requires option -c/--clean\n"),
                progname);
        exit_nicely(1);
    }

diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index 915a1ed64634ee1bace75a5358f2a3975d1c3aae..302d0054b2c9151031ee3af99cf676039d3c7d22 100644 (file)
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -683,7 +683,7 @@ PrintNewControlValues()
 
    if (set_xid_epoch != -1)
    {
-       printf(_("NextXID Epoch:                        %u\n"),
+       printf(_("NextXID epoch:                        %u\n"),
               ControlFile.checkPointCopy.nextXidEpoch);
    }
 }

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 161de75b0acd873e3266126c67b9a10f76ecd386..741a72d9254cf0ba507485166aabc3434097e062 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -2509,7 +2509,7 @@ printPsetInfo(const char *param, struct printQueryOpt *popt)
        if (popt->topt.default_footer)
            printf(_("Default footer (%s) is on.\n"), param);
        else
-           printf(_("Default footer (%s) is off."), param);
+           printf(_("Default footer (%s) is off.\n"), param);
    }
 
    /* show format */

diff --git a/src/common/username.c b/src/common/username.c
index 24c5b476278ce2cad121a831fd73cd78f616efa6..aa3ebeaa90e709382618a68d6684bd9b8d033967 100644 (file)
--- a/src/common/username.c
+++ b/src/common/username.c
@@ -42,7 +42,7 @@ get_user_name(char **errstr)
    pw = getpwuid(user_id);
    if (!pw)
    {
-       *errstr = psprintf(_("failed to look up effective user id %ld: %s"),
+       *errstr = psprintf(_("could not look up effective user ID %ld: %s"),
                           (long) user_id,
                         errno ? strerror(errno) : _("user does not exist"));
        return NULL;

diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index e3e350c0f80e11c3d3d6aeda2dbf923667637a9d..f5238d6cadc2e72c465fa5e68af0f014f0294791 100644 (file)
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -153,7 +153,7 @@ _PG_init(void)
                             NULL, NULL, NULL);
 
    DefineCustomBoolVariable("plpgsql.print_strict_params",
-                            gettext_noop("Print information about parameters in the DETAIL part of the error messages generated on INTO .. STRICT failures."),
+                            gettext_noop("Print information about parameters in the DETAIL part of the error messages generated on INTO ... STRICT failures."),
                             NULL,
                             &plpgsql_print_strict_params,
                             false,
@@ -161,7 +161,7 @@ _PG_init(void)
                             NULL, NULL, NULL);
 
    DefineCustomStringVariable("plpgsql.extra_warnings",
-                              gettext_noop("List of programming constructs which should produce a warning."),
+                              gettext_noop("List of programming constructs that should produce a warning."),
                               NULL,
                               &plpgsql_extra_warnings_string,
                               "none",
@@ -171,7 +171,7 @@ _PG_init(void)
                               NULL);
 
    DefineCustomStringVariable("plpgsql.extra_errors",
-                              gettext_noop("List of programming constructs which should produce an error."),
+                              gettext_noop("List of programming constructs that should produce an error."),
                               NULL,
                               &plpgsql_extra_errors_string,
                               "none",