* trunk/contrib/client-side/svnmerge:   - Another fix for non-English localized output.
* trunk/contrib/client-side/svnmerge:
  - Another fix for non-English localized output.

Patch by: Martin Struwe <mastr@von-oertzen.org>

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion