This fixes #8413.

whitespace cleaned up and do the proper plurality for "N file(s)" based on N.

Refactoring closes issue8912. Thanks to Éric Araujo for the patch.

Revert -r82559;  it's not clear that this is the right thing to do, and the change obscures the original intentions.