Message editing: remove gratuitous variations in message wording, standardize

terms, add some clarifications, fix some untranslatable attempts at dynamic
message building.

15 files changed, 108 insertions, 98 deletions

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index ae2fd2e15b4..dad99b0059d 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.86 2003/08/04 02:39:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.87 2003/09/25 06:57:56 petere Exp $
  *
  * NOTES
  *	  The old interface functions have been converted to macros
@@ -581,7 +581,7 @@ heap_formtuple(TupleDesc tupleDescriptor,
 	if (numberOfAttributes > MaxTupleAttributeNumber)
 		ereport(ERROR,
 				(errcode(ERRCODE_TOO_MANY_COLUMNS),
-				 errmsg("number of attributes %d exceeds limit, %d",
+				 errmsg("number of columns (%d) exceeds limit (%d)",
 						numberOfAttributes, MaxTupleAttributeNumber)));
 
 	for (i = 0; i < numberOfAttributes; i++)
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 9c51ea33dc3..3f7a2ae22ec 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.67 2003/08/04 02:39:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.68 2003/09/25 06:57:56 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,7 +54,7 @@ index_formtuple(TupleDesc tupleDescriptor,
 	if (numberOfAttributes > INDEX_MAX_KEYS)
 		ereport(ERROR,
 				(errcode(ERRCODE_TOO_MANY_COLUMNS),
-				 errmsg("number of index attributes %d exceeds limit, %d",
+				 errmsg("number of index columns (%d) exceeds limit (%d)",
 						numberOfAttributes, INDEX_MAX_KEYS)));
 
 #ifdef TOAST_INDEX_HACK
@@ -162,7 +162,7 @@ index_formtuple(TupleDesc tupleDescriptor,
 	if ((size & INDEX_SIZE_MASK) != size)
 		ereport(ERROR,
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-			errmsg("index tuple requires %lu bytes, maximum size is %lu",
+			errmsg("index row requires %lu bytes, maximum size is %lu",
 				   (unsigned long) size,
 				   (unsigned long) INDEX_SIZE_MASK)));
 
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 9a40c08ca92..180cdcb359c 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.99 2003/08/11 23:04:49 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.100 2003/09/25 06:57:56 petere Exp $
  *
  * NOTES
  *	  some of the executor utility code such as "ExecTypeFromTL" should be
@@ -657,7 +657,7 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)
 			if (length(colaliases) != natts)
 				ereport(ERROR,
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
-						 errmsg("number of aliases does not match number of attributes")));
+						 errmsg("number of aliases does not match number of columns")));
 
 			/* OK, use the aliases instead */
 			for (varattno = 0; varattno < natts; varattno++)
@@ -684,7 +684,7 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)
 		if (length(colaliases) != 1)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg("number of aliases does not match number of attributes")));
+					 errmsg("number of aliases does not match number of columns")));
 
 		/* OK, get the column alias */
 		attname = strVal(lfirst(colaliases));
@@ -701,7 +701,7 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)
 	else if (functyptype == 'p' && typeoid == RECORDOID)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
-				 errmsg("could not determine tuple description for function returning record")));
+				 errmsg("could not determine row description for function returning record")));
 	else
 	{
 		/* crummy error message, but parser should have caught this */
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 00b3d60b28c..5c10a74ad7b 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.30 2003/09/04 22:06:27 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.31 2003/09/25 06:57:56 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -87,7 +87,7 @@ _hash_doinsert(Relation rel, HashItem hitem)
 	if (itemsz > HashMaxItemSize((Page) metap))
 		ereport(ERROR,
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("index tuple size %lu exceeds hash maximum, %lu",
+				 errmsg("index row size %lu exceeds hash maximum %lu",
 						(unsigned long) itemsz,
 						(unsigned long) HashMaxItemSize((Page) metap))));
 
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 0cfbe5e7a12..931f8d8087c 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.36 2003/09/04 22:06:27 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.37 2003/09/25 06:57:56 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,7 +43,7 @@ _hash_formitem(IndexTuple itup)
 	if (IndexTupleHasNulls(itup))
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("hash indexes cannot include null keys")));
+				 errmsg("hash indexes cannot contain null keys")));
 
 	/*
 	 * make a copy of the index tuple (XXX do we still need to copy?)
@@ -129,8 +129,8 @@ _hash_checkpage(Relation rel, Page page, int flags)
 		if (metap->hashm_version != HASH_VERSION)
 			ereport(ERROR,
 					(errcode(ERRCODE_INDEX_CORRUPTED),
-					 errmsg("index \"%s\" has wrong hash version, please REINDEX it",
-							RelationGetRelationName(rel))));
+					 errmsg("index \"%s\" has wrong hash version", RelationGetRelationName(rel)),
+					 errhint("Please REINDEX it.")));
 	}
 
 	/*
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 3bcd8da1daf..2ddab234b0a 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.155 2003/09/15 23:33:38 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.156 2003/09/25 06:57:56 petere Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -577,7 +577,7 @@ heap_open(Oid relationId, LOCKMODE lockmode)
 	if (r->rd_rel->relkind == RELKIND_INDEX)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is an index relation",
+				 errmsg("\"%s\" is an index",
 						RelationGetRelationName(r))));
 	else if (r->rd_rel->relkind == RELKIND_SPECIAL)
 		ereport(ERROR,
@@ -612,7 +612,7 @@ heap_openrv(const RangeVar *relation, LOCKMODE lockmode)
 	if (r->rd_rel->relkind == RELKIND_INDEX)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is an index relation",
+				 errmsg("\"%s\" is an index",
 						RelationGetRelationName(r))));
 	else if (r->rd_rel->relkind == RELKIND_SPECIAL)
 		ereport(ERROR,
@@ -647,7 +647,7 @@ heap_openr(const char *sysRelationName, LOCKMODE lockmode)
 	if (r->rd_rel->relkind == RELKIND_INDEX)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is an index relation",
+				 errmsg("\"%s\" is an index",
 						RelationGetRelationName(r))));
 	else if (r->rd_rel->relkind == RELKIND_SPECIAL)
 		ereport(ERROR,
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 24c1a66b40e..9c7d72a7e4e 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: hio.c,v 1.49 2003/08/04 02:39:57 momjian Exp $
+ *	  $Id: hio.c,v 1.50 2003/09/25 06:57:57 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -106,7 +106,7 @@ RelationGetBufferForTuple(Relation relation, Size len,
 	if (len > MaxTupleSize)
 		ereport(ERROR,
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("tuple is too big: size %lu, maximum size %lu",
+				 errmsg("row is too big: size %lu, maximum size %lu",
 						(unsigned long) len,
 						(unsigned long) MaxTupleSize)));
 
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index fb88535f0e0..1f5d81d4b51 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.70 2003/08/08 21:41:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.71 2003/09/25 06:57:57 petere Exp $
  *
  * INTERFACE ROUTINES
  *		index_open		- open an index relation by relation OID
@@ -131,7 +131,7 @@ index_open(Oid relationId)
 	if (r->rd_rel->relkind != RELKIND_INDEX)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not an index relation",
+				 errmsg("\"%s\" is not an index",
 						RelationGetRelationName(r))));
 
 	pgstat_initstats(&r->pgstat_info, r);
@@ -156,7 +156,7 @@ index_openrv(const RangeVar *relation)
 	if (r->rd_rel->relkind != RELKIND_INDEX)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not an index relation",
+				 errmsg("\"%s\" is not an index",
 						RelationGetRelationName(r))));
 
 	pgstat_initstats(&r->pgstat_info, r);
@@ -181,7 +181,7 @@ index_openr(const char *sysRelationName)
 	if (r->rd_rel->relkind != RELKIND_INDEX)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not an index relation",
+				 errmsg("\"%s\" is not an index",
 						RelationGetRelationName(r))));
 
 	pgstat_initstats(&r->pgstat_info, r);
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index c8dbbfb0415..27c833408d6 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.105 2003/09/02 22:10:16 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.106 2003/09/25 06:57:57 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -251,7 +251,7 @@ _bt_check_unique(Relation rel, BTItem btitem, Relation heapRel,
 					 */
 					ereport(ERROR,
 							(errcode(ERRCODE_UNIQUE_VIOLATION),
-							 errmsg("duplicate key violates UNIQUE constraint \"%s\"",
+							 errmsg("duplicate key violates unique constraint \"%s\"",
 									RelationGetRelationName(rel))));
 				}
 				else if (htup.t_data != NULL)
@@ -403,7 +403,7 @@ _bt_insertonpg(Relation rel,
 	if (itemsz > BTMaxItemSize(page))
 		ereport(ERROR,
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("index tuple size %lu exceeds btree maximum, %lu",
+				 errmsg("index row size %lu exceeds btree maximum, %lu",
 						(unsigned long) itemsz,
 						(unsigned long) BTMaxItemSize(page))));
 
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 23bc2fb0629..2cb57aadc23 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.70 2003/08/10 19:48:08 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.71 2003/09/25 06:57:57 petere Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -153,7 +153,7 @@ _bt_getroot(Relation rel, int access)
 	if (metad->btm_version != BTREE_VERSION)
 		ereport(ERROR,
 				(errcode(ERRCODE_INDEX_CORRUPTED),
-				 errmsg("version mismatch in \"%s\": file version %d, code version %d",
+				 errmsg("version mismatch in index \"%s\": file version %d, code version %d",
 						RelationGetRelationName(rel),
 						metad->btm_version, BTREE_VERSION)));
 
@@ -332,7 +332,7 @@ _bt_gettrueroot(Relation rel)
 	if (metad->btm_version != BTREE_VERSION)
 		ereport(ERROR,
 				(errcode(ERRCODE_INDEX_CORRUPTED),
-				 errmsg("version mismatch in \"%s\": file version %d, code version %d",
+				 errmsg("version mismatch in index \"%s\": file version %d, code version %d",
 						RelationGetRelationName(rel),
 						metad->btm_version, BTREE_VERSION)));
 
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 63dd938774c..d8ea19434f9 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -36,7 +36,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsort.c,v 1.75 2003/08/04 02:39:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsort.c,v 1.76 2003/09/25 06:57:57 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -399,7 +399,7 @@ _bt_buildadd(Relation index, BTPageState *state, BTItem bti)
 	if (btisz > BTMaxItemSize(npage))
 		ereport(ERROR,
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("index tuple size %lu exceeds btree maximum, %lu",
+				 errmsg("index row size %lu exceeds btree maximum, %lu",
 						(unsigned long) btisz,
 						(unsigned long) BTMaxItemSize(npage))));
 
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index f672cc7fe14..e8c0cf32e9d 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.79 2003/08/04 02:39:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.80 2003/09/25 06:57:57 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -782,7 +782,7 @@ rtpicksplit(Relation r,
 	if (newitemsz > RTPageAvailSpace)
 		ereport(ERROR,
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("index tuple size %lu exceeds rtree maximum, %lu",
+				 errmsg("index row size %lu exceeds rtree maximum, %lu",
 						(unsigned long) newitemsz,
 						(unsigned long) RTPageAvailSpace)));
 
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index 3f0d387d447..f0ca7ffb76a 100644
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/access/transam/slru.c,v 1.6 2003/08/08 21:41:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/slru.c,v 1.7 2003/09/25 06:57:57 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -611,35 +611,35 @@ SlruReportIOError(SlruCtl ctl, int pageno, TransactionId xid)
 			ereport(ERROR,
 					(errcode_for_file_access(),
 				errmsg("could not access status of transaction %u", xid),
-					 errdetail("open of file \"%s\" failed: %m",
+					 errdetail("could not open file \"%s\": %m",
 							   path)));
 			break;
 		case SLRU_CREATE_FAILED:
 			ereport(ERROR,
 					(errcode_for_file_access(),
 				errmsg("could not access status of transaction %u", xid),
-					 errdetail("creation of file \"%s\" failed: %m",
+					 errdetail("could not create file \"%s\": %m",
 							   path)));
 			break;
 		case SLRU_SEEK_FAILED:
 			ereport(ERROR,
 					(errcode_for_file_access(),
 				errmsg("could not access status of transaction %u", xid),
-				  errdetail("lseek of file \"%s\", offset %u failed: %m",
+				  errdetail("could not seek in file \"%s\" to offset %u: %m",
 							path, offset)));
 			break;
 		case SLRU_READ_FAILED:
 			ereport(ERROR,
 					(errcode_for_file_access(),
 				errmsg("could not access status of transaction %u", xid),
-				   errdetail("read of file \"%s\", offset %u failed: %m",
+				   errdetail("could not read from file \"%s\" at offset %u: %m",
 							 path, offset)));
 			break;
 		case SLRU_WRITE_FAILED:
 			ereport(ERROR,
 					(errcode_for_file_access(),
 				errmsg("could not access status of transaction %u", xid),
-				  errdetail("write of file \"%s\", offset %u failed: %m",
+				  errdetail("could not write to file \"%s\" at offset %u: %m",
 							path, offset)));
 			break;
 		default:
@@ -817,7 +817,7 @@ restart:;
 	{
 		LWLockRelease(ctl->locks->ControlLock);
 		ereport(LOG,
-				(errmsg("could not truncate \"%s\": apparent wraparound",
+				(errmsg("could not truncate directory \"%s\": apparent wraparound",
 						ctl->Dir)));
 		return;
 	}
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index e17a3f3c372..86fe062030d 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.153 2003/09/24 18:54:01 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.154 2003/09/25 06:57:57 petere Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -1425,7 +1425,7 @@ RequireTransactionChain(void *stmtNode, const char *stmtType)
 	ereport(ERROR,
 			(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
 	/* translator: %s represents an SQL statement name */
-			 errmsg("%s may only be used in BEGIN/END transaction blocks",
+			 errmsg("%s may only be used in transaction blocks",
 					stmtType)));
 }
 
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fd470c149ba..32e7672945e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.122 2003/08/04 02:39:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.123 2003/09/25 06:57:57 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1046,7 +1046,7 @@ XLogWrite(XLogwrtRqst WriteRqst)
 				if (close(openLogFile) != 0)
 					ereport(PANIC,
 							(errcode_for_file_access(),
-					errmsg("close of log file %u, segment %u failed: %m",
+					errmsg("could not close log file %u, segment %u: %m",
 						   openLogId, openLogSeg)));
 				openLogFile = -1;
 			}
@@ -1102,7 +1102,7 @@ XLogWrite(XLogwrtRqst WriteRqst)
 			if (lseek(openLogFile, (off_t) openLogOff, SEEK_SET) < 0)
 				ereport(PANIC,
 						(errcode_for_file_access(),
-						 errmsg("lseek of log file %u, segment %u, offset %u failed: %m",
+						 errmsg("could not seek in log file %u, segment %u to offset %u: %m",
 								openLogId, openLogSeg, openLogOff)));
 		}
 
@@ -1116,7 +1116,7 @@ XLogWrite(XLogwrtRqst WriteRqst)
 				errno = ENOSPC;
 			ereport(PANIC,
 					(errcode_for_file_access(),
-					 errmsg("write of log file %u, segment %u, offset %u failed: %m",
+					 errmsg("could not write to log file %u, segment %u at offset %u: %m",
 							openLogId, openLogSeg, openLogOff)));
 		}
 		openLogOff += BLCKSZ;
@@ -1162,7 +1162,7 @@ XLogWrite(XLogwrtRqst WriteRqst)
 				if (close(openLogFile) != 0)
 					ereport(PANIC,
 							(errcode_for_file_access(),
-					errmsg("close of log file %u, segment %u failed: %m",
+					errmsg("could not close log file %u, segment %u: %m",
 						   openLogId, openLogSeg)));
 				openLogFile = -1;
 			}
@@ -1360,7 +1360,7 @@ XLogFileInit(uint32 log, uint32 seg,
 			if (errno != ENOENT)
 				ereport(PANIC,
 						(errcode_for_file_access(),
-						 errmsg("open of \"%s\" (log file %u, segment %u) failed: %m",
+						 errmsg("could not open file \"%s\" (log file %u, segment %u): %m",
 								path, log, seg)));
 		}
 		else
@@ -1384,7 +1384,7 @@ XLogFileInit(uint32 log, uint32 seg,
 	if (fd < 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
-				 errmsg("creation of file \"%s\" failed: %m", tmppath)));
+				 errmsg("could not create file \"%s\": %m", tmppath)));
 
 	/*
 	 * Zero-fill the file.	We have to do this the hard way to ensure that
@@ -1413,14 +1413,14 @@ XLogFileInit(uint32 log, uint32 seg,
 
 			ereport(PANIC,
 					(errcode_for_file_access(),
-					 errmsg("failed to write \"%s\": %m", tmppath)));
+					 errmsg("could not write to file \"%s\": %m", tmppath)));
 		}
 	}
 
 	if (pg_fsync(fd) != 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
-				 errmsg("fsync of file \"%s\" failed: %m", tmppath)));
+				 errmsg("could not fsync file \"%s\": %m", tmppath)));
 
 	close(fd);
 
@@ -1449,7 +1449,7 @@ XLogFileInit(uint32 log, uint32 seg,
 	if (fd < 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
-			errmsg("open of \"%s\" (log file %u, segment %u) failed: %m",
+			errmsg("could not open file \"%s\" (log file %u, segment %u): %m",
 				   path, log, seg)));
 
 	return (fd);
@@ -1527,14 +1527,14 @@ InstallXLogFileSegment(uint32 log, uint32 seg, char *tmppath,
 	if (link(tmppath, path) < 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
-				 errmsg("link from \"%s\" to \"%s\" (initialization of log file %u, segment %u) failed: %m",
+				 errmsg("could not link file \"%s\" to \"%s\" (initialization of log file %u, segment %u): %m",
 						tmppath, path, log, seg)));
 	unlink(tmppath);
 #else
 	if (rename(tmppath, path) < 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
-				 errmsg("rename from \"%s\" to \"%s\" (initialization of log file %u, segment %u) failed: %m",
+				 errmsg("could not rename file \"%s\" to \"%s\" (initialization of log file %u, segment %u): %m",
 						tmppath, path, log, seg)));
 #endif
 
@@ -1563,13 +1563,13 @@ XLogFileOpen(uint32 log, uint32 seg, bool econt)
 		{
 			ereport(LOG,
 					(errcode_for_file_access(),
-			errmsg("open of \"%s\" (log file %u, segment %u) failed: %m",
+			errmsg("could not open file \"%s\" (log file %u, segment %u): %m",
 				   path, log, seg)));
 			return (fd);
 		}
 		ereport(PANIC,
 				(errcode_for_file_access(),
-			errmsg("open of \"%s\" (log file %u, segment %u) failed: %m",
+			errmsg("could not open file \"%s\" (log file %u, segment %u): %m",
 				   path, log, seg)));
 	}
 
@@ -1746,7 +1746,7 @@ RecordIsValid(XLogRecord *record, XLogRecPtr recptr, int emode)
 	if (!EQ_CRC64(record->xl_crc, crc))
 	{
 		ereport(emode,
-		 (errmsg("bad resource manager data checksum in record at %X/%X",
+		 (errmsg("incorrect resource manager data checksum in record at %X/%X",
 				 recptr.xlogid, recptr.xrecoff)));
 		return (false);
 	}
@@ -1769,7 +1769,7 @@ RecordIsValid(XLogRecord *record, XLogRecPtr recptr, int emode)
 		if (!EQ_CRC64(cbuf, crc))
 		{
 			ereport(emode,
-			(errmsg("bad checksum of backup block %d in record at %X/%X",
+			(errmsg("incorrect checksum of backup block %d in record at %X/%X",
 					i + 1, recptr.xlogid, recptr.xrecoff)));
 			return (false);
 		}
@@ -1864,7 +1864,7 @@ ReadRecord(XLogRecPtr *RecPtr, int emode, char *buffer)
 		{
 			ereport(emode,
 					(errcode_for_file_access(),
-					 errmsg("lseek of log file %u, segment %u, offset %u failed: %m",
+					 errmsg("could not seek in log file %u, segment %u to offset %u: %m",
 							readId, readSeg, readOff)));
 			goto next_record_is_invalid;
 		}
@@ -1872,7 +1872,7 @@ ReadRecord(XLogRecPtr *RecPtr, int emode, char *buffer)
 		{
 			ereport(emode,
 					(errcode_for_file_access(),
-					 errmsg("read of log file %u, segment %u, offset %u failed: %m",
+					 errmsg("could not read from log file %u, segment %u at offset %u: %m",
 							readId, readSeg, readOff)));
 			goto next_record_is_invalid;
 		}
@@ -1930,7 +1930,7 @@ got_record:;
 	if (record->xl_rmid > RM_MAX_ID)
 	{
 		ereport(emode,
-				(errmsg("invalid resource manager id %u at %X/%X",
+				(errmsg("invalid resource manager ID %u at %X/%X",
 					 record->xl_rmid, RecPtr->xlogid, RecPtr->xrecoff)));
 		goto next_record_is_invalid;
 	}
@@ -1962,7 +1962,7 @@ got_record:;
 			{
 				ereport(emode,
 						(errcode_for_file_access(),
-						 errmsg("read of log file %u, segment %u, offset %u failed: %m",
+						 errmsg("could not read log file %u, segment %u, offset %u: %m",
 								readId, readSeg, readOff)));
 				goto next_record_is_invalid;
 			}
@@ -2191,13 +2191,13 @@ WriteControlFile(void)
 			errno = ENOSPC;
 		ereport(PANIC,
 				(errcode_for_file_access(),
-				 errmsg("write to control file failed: %m")));
+				 errmsg("could not write to control file: %m")));
 	}
 
 	if (pg_fsync(fd) != 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
-				 errmsg("fsync of control file failed: %m")));
+				 errmsg("could not fsync of control file: %m")));
 
 	close(fd);
 }
@@ -2221,7 +2221,7 @@ ReadControlFile(void)
 	if (read(fd, ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
 		ereport(PANIC,
 				(errcode_for_file_access(),
-				 errmsg("read from control file failed: %m")));
+				 errmsg("could not read from control file: %m")));
 
 	close(fd);
 
@@ -2247,7 +2247,7 @@ ReadControlFile(void)
 
 	if (!EQ_CRC64(crc, ControlFile->crc))
 		ereport(FATAL,
-				(errmsg("invalid checksum in control file")));
+				(errmsg("incorrect checksum in control file")));
 
 	/*
 	 * Do compatibility checking immediately.  We do this here for 2
@@ -2368,13 +2368,13 @@ UpdateControlFile(void)
 			errno = ENOSPC;
 		ereport(PANIC,
 				(errcode_for_file_access(),
-				 errmsg("write to control file failed: %m")));
+				 errmsg("could not write to control file: %m")));
 	}
 
 	if (pg_fsync(fd) != 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
-				 errmsg("fsync of control file failed: %m")));
+				 errmsg("could not fsync control file: %m")));
 
 	close(fd);
 }
@@ -2516,13 +2516,13 @@ BootStrapXLOG(void)
 			errno = ENOSPC;
 		ereport(PANIC,
 				(errcode_for_file_access(),
-				 errmsg("failed to write bootstrap xlog file: %m")));
+				 errmsg("could not write bootstrap transaction log file: %m")));
 	}
 
 	if (pg_fsync(openLogFile) != 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
-				 errmsg("failed to fsync bootstrap xlog file: %m")));
+				 errmsg("could not fsync bootstrap transaction log file: %m")));
 
 	close(openLogFile);
 	openLogFile = -1;
@@ -2654,11 +2654,11 @@ StartupXLOG(void)
 					checkPoint.undo.xlogid, checkPoint.undo.xrecoff,
 					wasShutdown ? "TRUE" : "FALSE")));
 	ereport(LOG,
-			(errmsg("next transaction id: %u; next oid: %u",
+			(errmsg("next transaction ID: %u; next OID: %u",
 					checkPoint.nextXid, checkPoint.nextOid)));
 	if (!TransactionIdIsNormal(checkPoint.nextXid))
 		ereport(PANIC,
-				(errmsg("invalid next transaction id")));
+				(errmsg("invalid next transaction ID")));
 
 	ShmemVariableCache->nextXid = checkPoint.nextXid;
 	ShmemVariableCache->nextOid = checkPoint.nextOid;
@@ -2976,10 +2976,12 @@ ReadCheckpointRecord(XLogRecPtr RecPtr,
 
 	if (!XRecOffIsValid(RecPtr.xrecoff))
 	{
-		ereport(LOG,
-		/* translator: %s is "primary" or "secondary" */
-				(errmsg("invalid %s checkpoint link in control file",
-		(whichChkpt == 1) ? gettext("primary") : gettext("secondary"))));
+		if (whichChkpt == 1)
+			ereport(LOG,
+					(errmsg("invalid primary checkpoint link in control file")));
+		else
+			ereport(LOG,
+					(errmsg("invalid secondary checkpoint link in control file")));
 		return NULL;
 	}
 
@@ -2987,35 +2989,43 @@ ReadCheckpointRecord(XLogRecPtr RecPtr,
 
 	if (record == NULL)
 	{
-		ereport(LOG,
-		/* translator: %s is "primary" or "secondary" */
-				(errmsg("invalid %s checkpoint record",
-		(whichChkpt == 1) ? gettext("primary") : gettext("secondary"))));
+		if (whichChkpt == 1)
+			ereport(LOG,
+					(errmsg("invalid primary checkpoint record")));
+		else
+			ereport(LOG,
+					(errmsg("invalid secondary checkpoint record")));
 		return NULL;
 	}
 	if (record->xl_rmid != RM_XLOG_ID)
 	{
-		ereport(LOG,
-		/* translator: %s is "primary" or "secondary" */
-		   (errmsg("invalid resource manager id in %s checkpoint record",
-		(whichChkpt == 1) ? gettext("primary") : gettext("secondary"))));
+		if (whichChkpt == 1)
+			ereport(LOG,
+					(errmsg("invalid resource manager ID in primary checkpoint record")));
+		else
+			ereport(LOG,
+					(errmsg("invalid resource manager ID in secondary checkpoint record")));
 		return NULL;
 	}
 	if (record->xl_info != XLOG_CHECKPOINT_SHUTDOWN &&
 		record->xl_info != XLOG_CHECKPOINT_ONLINE)
 	{
-		ereport(LOG,
-		/* translator: %s is "primary" or "secondary" */
-				(errmsg("invalid xl_info in %s checkpoint record",
-		(whichChkpt == 1) ? gettext("primary") : gettext("secondary"))));
+		if (whichChkpt == 1)
+			ereport(LOG,
+					(errmsg("invalid xl_info in primary checkpoint record")));
+		else
+			ereport(LOG,
+					(errmsg("invalid xl_info in secondary checkpoint record")));
 		return NULL;
 	}
 	if (record->xl_len != sizeof(CheckPoint))
 	{
-		ereport(LOG,
-		/* translator: %s is "primary" or "secondary" */
-				(errmsg("invalid length of %s checkpoint record",
-		(whichChkpt == 1) ? gettext("primary") : gettext("secondary"))));
+		if (whichChkpt == 1)
+			ereport(LOG,
+					(errmsg("invalid length of primary checkpoint record")));
+		else
+			ereport(LOG,
+					(errmsg("invalid length of secondary checkpoint record")));
 		return NULL;
 	}
 	return record;
@@ -3545,14 +3555,14 @@ assign_xlog_sync_method(const char *method, bool doit, bool interactive)
 			if (pg_fsync(openLogFile) != 0)
 				ereport(PANIC,
 						(errcode_for_file_access(),
-					errmsg("fsync of log file %u, segment %u failed: %m",
+					errmsg("could not fsync log file %u, segment %u: %m",
 						   openLogId, openLogSeg)));
 			if (open_sync_bit != new_sync_bit)
 			{
 				if (close(openLogFile) != 0)
 					ereport(PANIC,
 							(errcode_for_file_access(),
-					errmsg("close of log file %u, segment %u failed: %m",
+					errmsg("could not close log file %u, segment %u: %m",
 						   openLogId, openLogSeg)));
 				openLogFile = -1;
 			}
@@ -3577,7 +3587,7 @@ issue_xlog_fsync(void)
 			if (pg_fsync(openLogFile) != 0)
 				ereport(PANIC,
 						(errcode_for_file_access(),
-					errmsg("fsync of log file %u, segment %u failed: %m",
+					errmsg("could not fsync log file %u, segment %u: %m",
 						   openLogId, openLogSeg)));
 			break;
 #ifdef HAVE_FDATASYNC
@@ -3585,7 +3595,7 @@ issue_xlog_fsync(void)
 			if (pg_fdatasync(openLogFile) != 0)
 				ereport(PANIC,
 						(errcode_for_file_access(),
-				errmsg("fdatasync of log file %u, segment %u failed: %m",
+				errmsg("could not fdatasync log file %u, segment %u: %m",
 					   openLogId, openLogSeg)));
 			break;
 #endif