pg_basebackup: Small message punctuation improvements

petere · petere · commit 6925e38dadca · 2012-12-19T07:01:11.000-05:00
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -1136,7 +1136,7 @@ BaseBackup(void)
 
 		if (verbose)
 			fprintf(stderr,
-					_("%s: waiting for background process to finish streaming...\n"), progname);
+					_("%s: waiting for background process to finish streaming ...\n"), progname);
 
 #ifndef WIN32
 		if (write(bgpipe[1], xlogend, strlen(xlogend)) != strlen(xlogend))
@@ -1443,7 +1443,7 @@ main(int argc, char **argv)
 	if (format != 'p' && streamwal)
 	{
 		fprintf(stderr,
-				_("%s: wal streaming can only be used in plain mode\n"),
+				_("%s: WAL streaming can only be used in plain mode\n"),
 				progname);
 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
 				progname);
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -80,7 +80,7 @@ stop_streaming(XLogRecPtr segendpos, uint32 timeline, bool segment_finished)
 
 	if (time_to_abort)
 	{
-		fprintf(stderr, _("%s: received interrupt signal, exiting.\n"),
+		fprintf(stderr, _("%s: received interrupt signal, exiting\n"),
 				progname);
 		return true;
 	}
@@ -427,14 +427,14 @@ main(int argc, char **argv)
 		}
 		else if (noloop)
 		{
-			fprintf(stderr, _("%s: disconnected.\n"), progname);
+			fprintf(stderr, _("%s: disconnected\n"), progname);
 			exit(1);
 		}
 		else
 		{
 			fprintf(stderr,
 					/* translator: check source for value for %d */
-					_("%s: disconnected. Waiting %d seconds to try again.\n"),
+					_("%s: disconnected; waiting %d seconds to try again\n"),
 					progname, RECONNECT_SLEEP_TIME);
 			pg_usleep(RECONNECT_SLEEP_TIME * 1000000);
 		}

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ stop_streaming(XLogRecPtr segendpos, uint32 timeline, bool segment_finished)`
`80`	`80`
`81`	`81`	`if (time_to_abort)`
`82`	`82`	`{`
`83`		`- fprintf(stderr, _("%s: received interrupt signal, exiting.\n"),`
	`83`	`+ fprintf(stderr, _("%s: received interrupt signal, exiting\n"),`
`84`	`84`	`progname);`
`85`	`85`	`return true;`
`86`	`86`	`}`
`@@ -427,14 +427,14 @@ main(int argc, char **argv)`
`427`	`427`	`}`
`428`	`428`	`else if (noloop)`
`429`	`429`	`{`
`430`		`- fprintf(stderr, _("%s: disconnected.\n"), progname);`
	`430`	`+ fprintf(stderr, _("%s: disconnected\n"), progname);`
`431`	`431`	`exit(1);`
`432`	`432`	`}`
`433`	`433`	`else`
`434`	`434`	`{`
`435`	`435`	`fprintf(stderr,`
`436`	`436`	`/* translator: check source for value for %d */`
`437`		`- _("%s: disconnected. Waiting %d seconds to try again.\n"),`
	`437`	`+ _("%s: disconnected; waiting %d seconds to try again\n"),`
`438`	`438`	`progname, RECONNECT_SLEEP_TIME);`
`439`	`439`	`pg_usleep(RECONNECT_SLEEP_TIME * 1000000);`
`440`	`440`	`}`