Index: src/bin/pg_dump/pg_dump.c
===================================================================
RCS file: /a/pgsql/dev/anoncvs/pgsql/src/bin/pg_dump/pg_dump.c,v
retrieving revision 1.535
diff -c -r1.535 pg_dump.c
*** src/bin/pg_dump/pg_dump.c	8 Apr 2009 19:02:37 -0000	1.535
--- src/bin/pg_dump/pg_dump.c	15 May 2009 23:40:31 -0000
***************
*** 7728,7734 ****
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, "query returned %d rows instead of one: %s\n",
  				  ntups, query->data);
  		exit_nicely();
  	}
--- 7728,7736 ----
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
! 								 "query returned %d rows instead of one: %s\n",
! 								 ntups),
  				  ntups, query->data);
  		exit_nicely();
  	}
***************
*** 7976,7982 ****
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, "query returned %d rows instead of one: %s\n",
  				  ntups, query);
  		exit_nicely();
  	}
--- 7978,7986 ----
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
! 								 "query returned %d rows instead of one: %s\n",
! 								 ntups),
  				  ntups, query);
  		exit_nicely();
  	}
***************
*** 8080,8086 ****
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, "query returned %d rows instead of one: %s\n",
  				  ntups, query->data);
  		exit_nicely();
  	}
--- 8084,8092 ----
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
! 								 "query returned %d rows instead of one: %s\n",
! 								 ntups),
  				  ntups, query->data);
  		exit_nicely();
  	}
***************
*** 8459,8465 ****
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, "query returned %d rows instead of one: %s\n",
  				  ntups, query->data);
  		exit_nicely();
  	}
--- 8465,8473 ----
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
! 								 "query returned %d rows instead of one: %s\n",
! 								 ntups),
  				  ntups, query->data);
  		exit_nicely();
  	}
***************
*** 8633,8639 ****
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, "query returned %d rows instead of one: %s\n",
  				  ntups, query->data);
  		exit_nicely();
  	}
--- 8641,8649 ----
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
! 								 "query returned %d rows instead of one: %s\n",
! 								 ntups),
  				  ntups, query->data);
  		exit_nicely();
  	}
***************
*** 8828,8834 ****
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, "query returned %d rows instead of one: %s\n",
  				  ntups, query->data);
  		exit_nicely();
  	}
--- 8838,8846 ----
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
! 								 "query returned %d rows instead of one: %s\n",
! 								 ntups),
  				  ntups, query->data);
  		exit_nicely();
  	}
***************
*** 9053,9059 ****
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, "query returned %d rows instead of one: %s\n",
  				  ntups, query->data);
  		exit_nicely();
  	}
--- 9065,9073 ----
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
! 								 "query returned %d rows instead of one: %s\n",
! 								 ntups),
  				  ntups, query->data);
  		exit_nicely();
  	}
***************
*** 9206,9212 ****
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, "query returned %d rows instead of one: %s\n",
  				  ntups, query->data);
  		exit_nicely();
  	}
--- 9220,9228 ----
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
! 								 "query returned %d rows instead of one: %s\n",
! 								 ntups),
  				  ntups, query->data);
  		exit_nicely();
  	}
***************
*** 9390,9396 ****
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, "query returned %d rows instead of one: %s\n",
  				  ntups, query->data);
  		exit_nicely();
  	}
--- 9406,9414 ----
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
! 								 "query returned %d rows instead of one: %s\n",
! 								 ntups),
  				  ntups, query->data);
  		exit_nicely();
  	}
***************
*** 11244,11250 ****
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, "query returned %d rows instead of one: %s\n",
  				  ntups, query->data);
  		exit_nicely();
  	}
--- 11262,11270 ----
  	ntups = PQntuples(res);
  	if (ntups != 1)
  	{
! 		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
! 								 "query returned %d rows instead of one: %s\n",
! 								 ntups),
  				  ntups, query->data);
  		exit_nicely();
  	}