Commit 7f699804 authored by Peter Eisentraut's avatar Peter Eisentraut

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.
parent 13684090
...@@ -236,23 +236,25 @@ progress_report(int tablespacenum, const char *filename) ...@@ -236,23 +236,25 @@ progress_report(int tablespacenum, const char *filename)
* call) * call)
*/ */
fprintf(stderr, fprintf(stderr,
ngettext("%s/%s kB (100%%), %d/%d tablespace %35s\r", ngettext("%s/%s kB (100%%), %d/%d tablespace %35s",
"%s/%s kB (100%%), %d/%d tablespaces %35s\r", "%s/%s kB (100%%), %d/%d tablespaces %35s",
tablespacecount), tablespacecount),
totaldone_str, totalsize_str, tablespacenum, tablespacecount, ""); totaldone_str, totalsize_str, tablespacenum, tablespacecount, "");
else else
fprintf(stderr, fprintf(stderr,
ngettext("%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)\r", ngettext("%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)",
"%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)\r", "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)",
tablespacecount), tablespacecount),
totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount, filename); totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount, filename);
} }
else else
fprintf(stderr, fprintf(stderr,
ngettext("%s/%s kB (%d%%), %d/%d tablespace\r", ngettext("%s/%s kB (%d%%), %d/%d tablespace",
"%s/%s kB (%d%%), %d/%d tablespaces\r", "%s/%s kB (%d%%), %d/%d tablespaces",
tablespacecount), tablespacecount),
totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount); totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount);
fprintf(stderr, "\r");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment