Commit7f69980

committed

Move \r out of translatable strings

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

1 parent1368409 commit7f69980Copy full SHA for 7f69980

File tree

-6

lines changed

-6

lines changed

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -236,23 +236,25 @@ progress_report(int tablespacenum, const char *filename)`
`236`	`236`	`* call)`
`237`	`237`	`*/`
`238`	`238`	`fprintf(stderr,`
`239`		`-ngettext("%s/%s kB (100%%), %d/%d tablespace %35s\r",`
`240`		`-"%s/%s kB (100%%), %d/%d tablespaces %35s\r",`
	`239`	`+ngettext("%s/%s kB (100%%), %d/%d tablespace %35s",`
	`240`	`+"%s/%s kB (100%%), %d/%d tablespaces %35s",`
`241`	`241`	`tablespacecount),`
`242`	`242`	`totaldone_str,totalsize_str,tablespacenum,tablespacecount,"");`
`243`	`243`	`else`
`244`	`244`	`fprintf(stderr,`
`245`		`-ngettext("%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)\r",`
`246`		`-"%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)\r",`
	`245`	`+ngettext("%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)",`
	`246`	`+"%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)",`
`247`	`247`	`tablespacecount),`
`248`	`248`	`totaldone_str,totalsize_str,percent,tablespacenum,tablespacecount,filename);`
`249`	`249`	`}`
`250`	`250`	`else`
`251`	`251`	`fprintf(stderr,`
`252`		`-ngettext("%s/%s kB (%d%%), %d/%d tablespace\r",`
`253`		`-"%s/%s kB (%d%%), %d/%d tablespaces\r",`
	`252`	`+ngettext("%s/%s kB (%d%%), %d/%d tablespace",`
	`253`	`+"%s/%s kB (%d%%), %d/%d tablespaces",`
`254`	`254`	`tablespacecount),`
`255`	`255`	`totaldone_str,totalsize_str,percent,tablespacenum,tablespacecount);`
	`256`	`+`
	`257`	`+fprintf(stderr,"\r");`
`256`	`258`	`}`
`257`	`259`
`258`	`260`

Comments

(0)