diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 2344937851b4b5551afe15d4c8151c004b31cdea..c33df4d4baf96e156df915679b2e77fe9523d09f 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -631,7 +631,7 @@ RestoreArchive(Archive *AHX)
{
/* Show namespace if available */
if (te->namespace)
- ahlog(AH, 1, "setting owner and privileges for %s \"%s\".\"%s\"\n",
+ ahlog(AH, 1, "setting owner and privileges for %s \"%s.%s\"\n",
te->desc, te->namespace, te->tag);
else
ahlog(AH, 1, "setting owner and privileges for %s \"%s\"\n",
@@ -711,7 +711,7 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te,
{
/* Show namespace if available */
if (te->namespace)
- ahlog(AH, 1, "creating %s \"%s\".\"%s\"\n",
+ ahlog(AH, 1, "creating %s \"%s.%s\"\n",
te->desc, te->namespace, te->tag);
else
ahlog(AH, 1, "creating %s \"%s\"\n", te->desc, te->tag);
@@ -807,7 +807,7 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te,
_becomeOwner(AH, te);
_selectOutputSchema(AH, te->namespace);
- ahlog(AH, 1, "processing data for table \"%s\".\"%s\"\n",
+ ahlog(AH, 1, "processing data for table \"%s.%s\"\n",
te->namespace, te->tag);
/*
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 7e75bc22c2c7c4ad8095b9e7aec12640d8223986..56c256df8a13d874f401a76f5c2c028649cd5d45 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -916,7 +916,7 @@ help(const char *progname)
printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n"));
printf(_(" --section=SECTION dump named section (pre-data, data, or post-data)\n"));
printf(_(" --serializable-deferrable wait until the dump can run without anomalies\n"));
- printf(_(" --snapshot=SNAPSHOT use given synchronous snapshot for the dump\n"));
+ printf(_(" --snapshot=SNAPSHOT use given snapshot for the dump\n"));
printf(_(" --strict-names require table and/or schema include patterns to\n"
" match at least one entity each\n"));
printf(_(" --use-set-session-authorization\n"
@@ -1455,7 +1455,7 @@ dumpTableData_copy(Archive *fout, DumpOptions *dopt, void *dcontext)
const char *column_list;
if (g_verbose)
- write_msg(NULL, "dumping contents of table \"%s\".\"%s\"\n",
+ write_msg(NULL, "dumping contents of table \"%s.%s\"\n",
tbinfo->dobj.namespace->dobj.name, classname);
/*
@@ -2852,7 +2852,7 @@ getPolicies(Archive *fout, TableInfo tblinfo[], int numTables)
continue;
if (g_verbose)
- write_msg(NULL, "reading row security enabled for table \"%s\".\"%s\"\n",
+ write_msg(NULL, "reading row security enabled for table \"%s.%s\"\n",
tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name);
@@ -2883,7 +2883,7 @@ getPolicies(Archive *fout, TableInfo tblinfo[], int numTables)
}
if (g_verbose)
- write_msg(NULL, "reading policies for table \"%s\".\"%s\"\n",
+ write_msg(NULL, "reading policies for table \"%s.%s\"\n",
tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name);
@@ -5327,7 +5327,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
continue;
if (g_verbose)
- write_msg(NULL, "reading indexes for table \"%s\".\"%s\"\n",
+ write_msg(NULL, "reading indexes for table \"%s.%s\"\n",
tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name);
@@ -5694,7 +5694,7 @@ getConstraints(Archive *fout, TableInfo tblinfo[], int numTables)
continue;
if (g_verbose)
- write_msg(NULL, "reading foreign key constraints for table \"%s\".\"%s\"\n",
+ write_msg(NULL, "reading foreign key constraints for table \"%s.%s\"\n",
tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name);
@@ -6033,7 +6033,7 @@ getTriggers(Archive *fout, TableInfo tblinfo[], int numTables)
continue;
if (g_verbose)
- write_msg(NULL, "reading triggers for table \"%s\".\"%s\"\n",
+ write_msg(NULL, "reading triggers for table \"%s.%s\"\n",
tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name);
@@ -6767,7 +6767,7 @@ getTableAttrs(Archive *fout, DumpOptions *dopt, TableInfo *tblinfo, int numTable
* the output of an indexscan on pg_attribute_relid_attnum_index.
*/
if (g_verbose)
- write_msg(NULL, "finding the columns and types of table \"%s\".\"%s\"\n",
+ write_msg(NULL, "finding the columns and types of table \"%s.%s\"\n",
tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name);
@@ -6980,7 +6980,7 @@ getTableAttrs(Archive *fout, DumpOptions *dopt, TableInfo *tblinfo, int numTable
int numDefaults;
if (g_verbose)
- write_msg(NULL, "finding default expressions of table \"%s\".\"%s\"\n",
+ write_msg(NULL, "finding default expressions of table \"%s.%s\"\n",
tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name);
@@ -7105,7 +7105,7 @@ getTableAttrs(Archive *fout, DumpOptions *dopt, TableInfo *tblinfo, int numTable
int numConstrs;
if (g_verbose)
- write_msg(NULL, "finding check constraints for table \"%s\".\"%s\"\n",
+ write_msg(NULL, "finding check constraints for table \"%s.%s\"\n",
tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name);
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index aa3e20a2d5f466d834b3af803a37c9c35cb73456..80c3fa89e491b535eafafcabdbd02b48d48e3bf4 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -1247,7 +1247,9 @@ repairDependencyLoop(DumpableObject **loop,
}
if (i >= nLoop)
{
- write_msg(NULL, "NOTICE: there are circular foreign-key constraints among these table(s):\n");
+ write_msg(NULL, ngettext("NOTICE: there are circular foreign-key constraints on this table:\n",
+ "NOTICE: there are circular foreign-key constraints among these tables:\n",
+ nLoop));
for (i = 0; i < nLoop; i++)
write_msg(NULL, " %s\n", loop[i]->name);
write_msg(NULL, "You might not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints.\n");