Patch #633547: Support plural forms. Do TODOs in test suite.
6 files changed