mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-01-06 15:24:56 +08:00
Small message fixes
This commit is contained in:
parent
3dad73e71f
commit
f25e0bf5e0
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -683,7 +683,7 @@ PrintNewControlValues()
|
||||
|
||||
if (set_xid_epoch != -1)
|
||||
{
|
||||
printf(_("NextXID Epoch: %u\n"),
|
||||
printf(_("NextXID epoch: %u\n"),
|
||||
ControlFile.checkPointCopy.nextXidEpoch);
|
||||
}
|
||||
}
|
||||
|
@ -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 */
|
||||
|
@ -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;
|
||||
|
@ -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",
|
||||
|
Loading…
Reference in New Issue
Block a user