i18n: the message should not contain '\r'
reported by bardy <bardiku@gmail.com>
test-highlight: adapt output to latest pygments keeping backwards compatibility
issue1577: fix broken test by assuming less about CVS output.
Specifically, output of "cvs ci" varies unpredictably across CVS versions,
so any test that includes the output of "cvs ci" is doomed to fail
some of the time. This fixes that by discarding the output of "cvs ci".