Small message fixes

petere · petere · commit f25e0bf5e0af · 2014-08-09T00:07:00.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -153,15 +153,15 @@ _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,
 							 PGC_USERSET, 0,
 							 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",

Original file line number	Diff line number	Diff line change
`@@ -2548,7 +2548,7 @@ check_locale_name(int category, const char locale, char *canonname)`
`2548`	`2548`	`save = setlocale(category, NULL);`
`2549`	`2549`	`if (!save)`
`2550`	`2550`	`{`
`2551`		`- fprintf(stderr, _("%s: setlocale failed\n"),`
	`2551`	`+ fprintf(stderr, _("%s: setlocale() failed\n"),`
`2552`	`2552`	`progname);`
`2553`	`2553`	`exit(1);`
`2554`	`2554`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1123,13 +1123,13 @@ update_tablespace_symlink(Oid oid, const char *old_dir)`
`1123`	`1123`
`1124`	`1124`	`if (unlink(linkloc) != 0 && errno != ENOENT)`
`1125`	`1125`	`{`
`1126`		`- fprintf(stderr, _("%s: could not remove symbolic link \"%s\": %s"),`
	`1126`	`+ fprintf(stderr, _("%s: could not remove symbolic link \"%s\": %s\n"),`
`1127`	`1127`	`progname, linkloc, strerror(errno));`
`1128`	`1128`	`disconnect_and_exit(1);`
`1129`	`1129`	`}`
`1130`	`1130`	`if (symlink(new_dir, linkloc) != 0)`
`1131`	`1131`	`{`
`1132`		`- fprintf(stderr, _("%s: could not create symbolic link \"%s\": %s"),`
	`1132`	`+ fprintf(stderr, _("%s: could not create symbolic link \"%s\": %s\n"),`
`1133`	`1133`	`progname, linkloc, strerror(errno));`
`1134`	`1134`	`disconnect_and_exit(1);`
`1135`	`1135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,7 @@ main(int argc, char **argv)`
`582`	`582`	`}`
`583`	`583`
`584`	`584`	`if (if_exists && !outputClean)`
`585`		`- exit_horribly(NULL, "option --if-exists requires -c/--clean option\n");`
	`585`	`+ exit_horribly(NULL, "option --if-exists requires option -c/--clean\n");`
`586`	`586`
`587`	`587`	`/* Identify archive format to emit */`
`588`	`588`	`archiveFormat = parseArchiveFormat(format, &archiveMode);`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ main(int argc, char *argv[])`
`338`	`338`
`339`	`339`	`if (if_exists && !output_clean)`
`340`	`340`	`{`
`341`		`- fprintf(stderr, _("%s: option --if-exists requires -c/--clean option\n"),`
	`341`	`+ fprintf(stderr, _("%s: option --if-exists requires option -c/--clean\n"),`
`342`	`342`	`progname);`
`343`	`343`	`exit_nicely(1);`
`344`	`344`	`}`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ main(int argc, char **argv)`
`340`	`340`
`341`	`341`	`if (if_exists && !opts->dropSchema)`
`342`	`342`	`{`
`343`		`- fprintf(stderr, _("%s: option --if-exists requires -c/--clean option\n"),`
	`343`	`+ fprintf(stderr, _("%s: option --if-exists requires option -c/--clean\n"),`
`344`	`344`	`progname);`
`345`	`345`	`exit_nicely(1);`
`346`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -683,7 +683,7 @@ PrintNewControlValues()`
`683`	`683`
`684`	`684`	`if (set_xid_epoch != -1)`
`685`	`685`	`{`
`686`		`- printf(_("NextXID Epoch: %u\n"),`
	`686`	`+ printf(_("NextXID epoch: %u\n"),`
`687`	`687`	`ControlFile.checkPointCopy.nextXidEpoch);`
`688`	`688`	`}`
`689`	`689`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2509,7 +2509,7 @@ printPsetInfo(const char param, struct printQueryOpt popt)`
`2509`	`2509`	`if (popt->topt.default_footer)`
`2510`	`2510`	`printf(_("Default footer (%s) is on.\n"), param);`
`2511`	`2511`	`else`
`2512`		`- printf(_("Default footer (%s) is off."), param);`
	`2512`	`+ printf(_("Default footer (%s) is off.\n"), param);`
`2513`	`2513`	`}`
`2514`	`2514`
`2515`	`2515`	`/* show format */`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ get_user_name(char **errstr)`
`42`	`42`	`pw = getpwuid(user_id);`
`43`	`43`	`if (!pw)`
`44`	`44`	`{`
`45`		`- *errstr = psprintf(_("failed to look up effective user id %ld: %s"),`
	`45`	`+ *errstr = psprintf(_("could not look up effective user ID %ld: %s"),`
`46`	`46`	`(long) user_id,`
`47`	`47`	`errno ? strerror(errno) : _("user does not exist"));`
`48`	`48`	`return NULL;`