From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 17 Aug 2011 07:52:35 +0000 (+0300)
Subject: Move \r out of translatable strings
X-Git-Tag: REL9_1_RC1~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9dcaf9a0526ff988566a47d21b5a8149e17c9ba2;p=thirdparty%2Fpostgresql.git

Move \r out of translatable strings

The translation tools are very unhappy about seeing \r in translatable
strings, so move it to a separate fprintf call.
---

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 4dab7ff0f2e..25c0a7893ac 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -236,23 +236,25 @@ progress_report(int tablespacenum, const char *filename)
 			 * call)
 			 */
 			fprintf(stderr,
-					ngettext("%s/%s kB (100%%), %d/%d tablespace %35s\r",
-							 "%s/%s kB (100%%), %d/%d tablespaces %35s\r",
+					ngettext("%s/%s kB (100%%), %d/%d tablespace %35s",
+							 "%s/%s kB (100%%), %d/%d tablespaces %35s",
 							 tablespacecount),
 					totaldone_str, totalsize_str, tablespacenum, tablespacecount, "");
 		else
 			fprintf(stderr,
-					ngettext("%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)\r",
-							 "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)\r",
+					ngettext("%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)",
+							 "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)",
 							 tablespacecount),
 					totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount, filename);
 	}
 	else
 		fprintf(stderr,
-				ngettext("%s/%s kB (%d%%), %d/%d tablespace\r",
-						 "%s/%s kB (%d%%), %d/%d tablespaces\r",
+				ngettext("%s/%s kB (%d%%), %d/%d tablespace",
+						 "%s/%s kB (%d%%), %d/%d tablespaces",
 						 tablespacecount),
 				totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount);
+
+	fprintf(stderr, "\r");
 }