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 4dab7ff0f2e0b8eb0278e6b4151a3c0ce0d89a65..25c0a7893ac6b21ee114f0828f030d4cdf2f3bfd 100644 (file)
--- 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");
 }