From 7f699804b12e480a07727472b9b8cf3886dbb897 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 17 Aug 2011 10:52:35 +0300 Subject: [PATCH] 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. --- src/bin/pg_basebackup/pg_basebackup.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index 13f2519d48..5c62be576e 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"); } -- 2.40.0